bitkeeper revision 1.1236.43.6 (4243f3f3rPSrXq5qC_rXYAkeTrQ7dQ)

manual merge

diff --cc .rootkeys
index e05072a0179232ce96e703cefc32ef4ce3c5f8c9,6f778d6167a3b31dfce37291f0bffbf785df5e32..ad520bef1be53cb49eec05bdc112b3ada75049ef
--- 1/.rootkeys
--- 2/.rootkeys
+++ b/.rootkeys
@@@ -465,8 -394,9 +465,10 @@@
  40ee75a967sxgcRY4Q7zXoVUaJ4flA tools/examples/vif-bridge
  41fc0c18AFAVXA1uGm1JFWHMeeznVw tools/examples/vif-nat
  41e661e1ooiRKlOfwumG6wwzc0PdhQ tools/examples/vif-route
+ 423ab2eaNCzxk3c-9yU1BwzxWvsDCQ tools/examples/vnc/Xservers
+ 423ab2ea7ajZLdZOI-8Z-bpNdNhhAQ tools/examples/vnc/Xvnc-xen
  40ee75a93cqxHp6MiYXxxwR5j2_8QQ tools/examples/xend-config.sxp
 +41dde8af6M2Pm1Rrv_f5jEFC_BIOIA tools/examples/xmexample.vmx
  41090ec8Pj_bkgCBpg2W7WfmNkumEA tools/examples/xmexample1
  40cf2937oKlROYOJTN8GWwWM5AmjBg tools/examples/xmexample2
  41fc0c18_k4iL81hu4pMIWQu9dKpKA tools/examples/xmexample3

diff --cc linux-2.6.11-xen-sparse/drivers/xen/netback/interface.c
Simple merge

diff --cc tools/python/xen/lowlevel/xu/xu.c
Simple merge

diff --cc tools/python/xen/xend/server/SrvDomain.py
Simple merge

diff --cc tools/python/xen/xend/server/blkif.py
Simple merge

diff --cc tools/python/xen/xend/server/channel.py
Simple merge

diff --cc tools/python/xen/xend/server/netif.py
index 2518a155bab8d8f5e8915c753ab4ef0056c9d23e,5d3ef5a18d2282054b833c93107f0146c818b17b..0a3bdacdbd3f1686d5e5367471d5e585da23c152
--- 1/tools/python/xen/xend/server/netif.py
--- 2/tools/python/xen/xend/server/netif.py
+++ b/tools/python/xen/xend/server/netif.py
@@@ -201,9 -195,9 +207,12 @@@ class NetDev(controller.SplitDev)
          val = ['vif',
                 ['idx', self.idx],
                 ['vif', vif],
-                ['mac', mac]]
+                ['mac', mac],
+                ['vifname', self.vifname],
+                ]
++
 +        if self.be_mac:
 +            val.append(['be_mac', self.get_be_mac()])
          if self.bridge:
              val.append(['bridge', self.bridge])
          if self.script:
@@@ -286,8 -280,9 +300,10 @@@
          msg = packMsg('netif_be_create_t',
                        { 'domid'        : self.controller.dom,
                          'netif_handle' : self.vif,
-                         'mac'          : self.mac })
 +                        'be_mac'       : self.be_mac or [0, 0, 0, 0, 0, 0],
+                         'mac'          : self.mac,
+                         #'vifname'      : self.vifname
+                         })
          self.getBackendInterface().writeRequest(msg, response=d)
          return d
  

diff --cc tools/python/xen/xm/create.py
index e79e02383cc19cb10980075d026ce0808599ecd3,d36c89af7b1cf3298b00cee0dd4022a95d2c74dd..bd8f81ae3e6d2d70b0b1f5af97d075a830dbde46
--- 1/tools/python/xen/xm/create.py
--- 2/tools/python/xen/xm/create.py
+++ b/tools/python/xen/xm/create.py
@@@ -160,7 -160,7 +169,7 @@@ gopts.var('ipaddr', val="IPADDR"
            fn=append_value, default=[],
            use="Add an IP address to the domain.")
  
- gopts.var('vif', val="mac=MAC,be_mac=MAC,bridge=BRIDGE,script=SCRIPT,backend=DOM",
 -gopts.var('vif', val="mac=MAC,bridge=BRIDGE,script=SCRIPT,backend=DOM,vifname=NAME",
++gopts.var('vif', val="mac=MAC,be_mac=MAC,bridge=BRIDGE,script=SCRIPT,backend=DOM,vifname=NAME",
            fn=append_value, default=[],
            use="""Add a network interface with the given MAC address and bridge.
            The vif is configured by calling the given configuration script.
@@@ -321,17 -300,18 +332,21 @@@ def configure_vifs(config_devs, vals)
              script = d.get('script')
              backend = d.get('backend')
              ip = d.get('ip')
+             vifname = d.get('vifname')
          else:
              mac = randomMAC()
 +            be_mac = None
              bridge = None
              script = None
              backend = None
              ip = None
+             vifname = None
          config_vif = ['vif']
          config_vif.append(['mac', mac])
+         if vifname:
+             config_vif.append(['vifname', vifname])
 +        if be_mac:
 +            config_vif.append(['be_mac', be_mac])
          if bridge:
              config_vif.append(['bridge', bridge])
          if script:
@@@ -429,7 -398,7 +444,7 @@@ def preprocess_vifs(opts, vals)
              (k, v) = b.strip().split('=', 1)
              k = k.strip()
              v = v.strip()
-             if k not in ['mac', 'be_mac', 'bridge', 'script', 'backend', 'ip']:
 -            if k not in ['mac', 'bridge', 'script', 'backend', 'ip', 'vifname']:
++            if k not in ['mac', 'be_mac', 'bridge', 'script', 'backend', 'ip', 'vifname']:
                  opts.err('Invalid vif specifier: ' + vif)
              d[k] = v
          vifs.append(d)